From eccd1bf398217fb4d4e5b14725f869904bc66e63 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 12 Sep 2005 19:49:03 +0000 Subject: [PATCH] Move block device bind/unbind into hotplug scripts. Fixes file: devices since unbind now runs after the backend driver closes the loopback device. Also moves name -> node translation into the backend domain. Signed-off-by: Christian Limpach --- tools/examples/Makefile | 1 + tools/examples/block-enbd | 40 ++++++++++++------------- tools/examples/block-file | 40 ++++++++++++------------- tools/examples/block-phy | 30 +++++++++++++++++++ tools/examples/xen-backend.agent | 18 +++++++++++ tools/python/xen/xend/XendDomainInfo.py | 13 ++------ 6 files changed, 92 insertions(+), 50 deletions(-) create mode 100644 tools/examples/block-phy diff --git a/tools/examples/Makefile b/tools/examples/Makefile index f23bb80956..36edb8789f 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -21,6 +21,7 @@ XEN_CONFIGS += xmexample.vmx XEN_SCRIPT_DIR = /etc/xen/scripts XEN_SCRIPTS = network-bridge vif-bridge XEN_SCRIPTS += network-route vif-route +XEN_SCRIPTS += block-phy XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd diff --git a/tools/examples/block-enbd b/tools/examples/block-enbd index a8fa108f0d..c86068d817 100755 --- a/tools/examples/block-enbd +++ b/tools/examples/block-enbd @@ -3,31 +3,31 @@ # Usage: block-enbd [bind server ctl_port |unbind node] # # The file argument to the bind command is the file we are to bind to a -# loop device. We print the path to the loop device node to stdout. +# loop device. # # The node argument to unbind is the name of the device node we are to # unbind. # # This assumes you're running a correctly configured server at the other end! -case $1 in - bind) - for dev in /dev/nd*; do - if nbd-client $2:$3 $dev; then - echo $dev - exit 0 - fi - done - exit 1 - ;; - - unbind) - nbd-client -d $2 - exit 0 - ;; +set -e - *) - echo 'Unknown command: ' $1 >&2 - echo 'Valid commands are: bind, unbind' >&2 - exit 1 +case $1 in + bind) + for dev in /dev/nd*; do + if nbd-client $2:$3 $dev; then + major=$(stat -L -c %t "$dev") + minor=$(stat -L -c %T "$dev") + pdev=$(printf "0x%02x%02x" 0x$major 0x$minor) + xenstore-write "$XENBUS_PATH"/physical-device $pdev \ + "$XENBUS_PATH"/node $dev + exit 0 + fi + done + exit 1 + ;; + unbind) + nbd-client -d $2 + exit 0 + ;; esac diff --git a/tools/examples/block-file b/tools/examples/block-file index a1612b6d47..3270fa07ba 100755 --- a/tools/examples/block-file +++ b/tools/examples/block-file @@ -3,29 +3,29 @@ # Usage: block_loop [bind file|unbind node] # # The file argument to the bind command is the file we are to bind to a -# loop device. We print the path to the loop device node to stdout. +# loop device. # # The node argument to unbind is the name of the device node we are to # unbind. -case $1 in - bind) - for dev in /dev/loop*; do - if losetup $dev $2; then - echo $dev - exit 0 - fi - done - exit 1 - ;; - - unbind) - losetup -d $2 - exit 0 - ;; +set -e - *) - echo 'Unknown command: ' $1 >&2 - echo 'Valid commands are: bind, unbind' >&2 - exit 1 +case $1 in + bind) + for dev in /dev/loop*; do + if losetup $dev $2; then + major=$(stat -L -c %t "$dev") + minor=$(stat -L -c %T "$dev") + pdev=$(printf "0x%02x%02x" 0x$major 0x$minor) + xenstore-write "$XENBUS_PATH"/physical-device $pdev \ + "$XENBUS_PATH"/node $dev + exit 0 + fi + done + exit 1 + ;; + unbind) + losetup -d $2 + exit 0 + ;; esac diff --git a/tools/examples/block-phy b/tools/examples/block-phy new file mode 100644 index 0000000000..a19a861bbe --- /dev/null +++ b/tools/examples/block-phy @@ -0,0 +1,30 @@ +#! /bin/sh + +set -e + +expand_dev() { + local dev + case $1 in + /*) + dev=$1 + ;; + *) + dev=/dev/$1 + ;; + esac + echo -n $dev +} + +case $1 in + bind) + dev=$(expand_dev $2) + major=$(stat -L -c %t "$dev") + minor=$(stat -L -c %T "$dev") + pdev=$(printf "0x%02x%02x" 0x$major 0x$minor) + xenstore-write "$XENBUS_PATH"/physical-device $pdev \ + "$XENBUS_PATH"/node $dev + exit 0 + ;; + unbind) + ;; +esac diff --git a/tools/examples/xen-backend.agent b/tools/examples/xen-backend.agent index 0058bd2842..91a5d0eb32 100755 --- a/tools/examples/xen-backend.agent +++ b/tools/examples/xen-backend.agent @@ -9,8 +9,26 @@ PATH=/etc/xen/scripts:$PATH case "$ACTION" in add) + case "$XENBUS_TYPE" in + vbd) + t=$(xenstore-read "$XENBUS_PATH"/type) + params=$(xenstore-read "$XENBUS_PATH"/params) + [ -x /etc/xen/scripts/block-"$t" ] && \ + /etc/xen/scripts/block-"$t" bind $params + ;; + esac ;; remove) + case "$XENBUS_TYPE" in + vbd) + t=$(xenstore-read "$XENBUS_PATH"/type) + node=$(xenstore-read "$XENBUS_PATH"/node) + [ -x /etc/xen/scripts/block-"$t" ] && \ + /etc/xen/scripts/block-"$t" unbind $node + ;; + esac + # remove device backend store entries + xenstore-rm "$XENBUS_PATH" ;; online) case "$PHYSDEVDRIVER" in diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 5cfd6133da..07e6d4c57b 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -413,17 +413,13 @@ class XendDomainInfo: db['backend'] = backdb.getPath() db['backend-id'] = "%i" % backdom.id - backdb['frontend'] = db.getPath() (type, params) = string.split(sxp.child_value(devconfig, 'uname'), ':', 1) - node = Blkctl.block('bind', type, params) + backdb['type'] = type + backdb['params'] = params + backdb['frontend'] = db.getPath() backdb['frontend-id'] = "%i" % self.id - backdb['physical-device'] = "%li" % blkdev_name_to_number(node) backdb.saveDB(save=True) - # Ok, super gross, this really doesn't belong in the frontend db... - db['type'] = type - db['node'] = node - db['params'] = params db.saveDB(save=True) return @@ -808,9 +804,6 @@ class XendDomainInfo: if type == 'vbd': typedb = ddb.addChild(type) for dev in typedb.keys(): - devdb = typedb.addChild(str(dev)) - Blkctl.block('unbind', devdb['type'].getData(), - devdb['node'].getData()) typedb[dev].delete() typedb.saveDB(save=True) if type == 'vtpm': -- 2.30.2